cssparser: Add gtk_css_parser_consume_ident()

And use it to fix the palette parser.

diff --git a/gtk/gtkcsspalettevalue.c b/gtk/gtkcsspalettevalue.c
index ac9088482c1e82ceafdc64f0fa80179d99d2a627..3514ac6bbb28d97ea3a13afe7748a6a188e9eb29 100644 (file)
--- a/gtk/gtkcsspalettevalue.c
+++ b/gtk/gtkcsspalettevalue.c
@@ -216,16 +216,15 @@ gtk_css_palette_value_parse (GtkCssParser *parser)
   GtkCssValue *result, *color;
   char *ident;
 
-  if (_gtk_css_parser_try (parser, "default", TRUE))
+  if (gtk_css_parser_try_ident (parser, "default"))
     return gtk_css_palette_value_new_default ();
   
   result = gtk_css_palette_value_new_empty ();
 
   do {
-    ident = _gtk_css_parser_try_ident (parser, TRUE);
+    ident = gtk_css_parser_consume_ident (parser);
     if (ident == NULL)
       {
-        _gtk_css_parser_error (parser, "expected color name");
         _gtk_css_value_unref (result);
         return NULL;
       }
@@ -240,7 +239,7 @@ gtk_css_palette_value_parse (GtkCssParser *parser)
 
     gtk_css_palette_value_add_color (result, ident, color);
     g_free (ident);
-  } while (_gtk_css_parser_try (parser, ",", TRUE));
+  } while (gtk_css_parser_try_token (parser, GTK_CSS_TOKEN_COMMA));
 
   return result;
 }

diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c
index 9da98a8f6f1a00e851869a1e14456f14032aba19..cd9970bbf03de00196bf39317efa97c3d8724f97 100644 (file)
--- a/gtk/gtkcssparser.c
+++ b/gtk/gtkcssparser.c
@@ -779,6 +779,18 @@ _gtk_css_parser_try_double (GtkCssParser *parser,
   return TRUE;
 }
 
+char *
+gtk_css_parser_consume_ident (GtkCssParser *self)
+{
+  char *result;
+
+  result = _gtk_css_parser_try_ident (self, TRUE);
+  if (result == NULL)
+    _gtk_css_parser_error (self, "Expected an identifier");
+
+  return result;
+}
+
 gboolean
 gtk_css_parser_consume_number (GtkCssParser *self,
                                double       *number)

diff --git a/gtk/gtkcssparserprivate.h b/gtk/gtkcssparserprivate.h
index e4b763a82647883ff52cbd341cb8d08c0d44bea3..683246a6f8269d4faaf84dac281e1e77ca69e7da 100644 (file)
--- a/gtk/gtkcssparserprivate.h
+++ b/gtk/gtkcssparserprivate.h
@@ -96,6 +96,7 @@ gboolean        _gtk_css_parser_try_double        (GtkCssParser          *parser
 gboolean        _gtk_css_parser_try_hash_color    (GtkCssParser          *parser,
                                                    GdkRGBA               *rgba);
 
+char *          gtk_css_parser_consume_ident      (GtkCssParser          *self);
 gboolean        gtk_css_parser_consume_number     (GtkCssParser          *self,
                                                    double                *number);
 gboolean        gtk_css_parser_consume_function   (GtkCssParser          *self,

diff --git a/gtk/gtkcssstringvalue.c b/gtk/gtkcssstringvalue.c
index 49b7d19d4d71f5a6a53d262fb369616eaf71fe9e..f6d0c2bf15c57fab572851ff996e6191dbed0026 100644 (file)
--- a/gtk/gtkcssstringvalue.c
+++ b/gtk/gtkcssstringvalue.c
@@ -200,7 +200,7 @@ _gtk_css_ident_value_try_parse (GtkCssParser *parser)
 
   g_return_val_if_fail (parser != NULL, NULL);
 
-  ident = _gtk_css_parser_try_ident (parser, TRUE);
+  ident = gtk_css_parser_consume_ident (parser);
   if (ident == NULL)
     return NULL;
   

diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index ed41c912db8367246397d7abe72b67e009b2a494..a12685655ae20610fe99c3874e265a4ea40b2ca1 100644 (file)
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -159,13 +159,16 @@ font_family_parse_one (GtkCssParser *parser)
 {
   char *name;
 
-  name = _gtk_css_parser_try_ident (parser, TRUE);
-  if (name)
+  if (gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_IDENT))
     {
-      GString *string = g_string_new (name);
+      GString *string = g_string_new (NULL);
+
+      name = gtk_css_parser_consume_ident (parser);
+      g_string_append (string, name);
       g_free (name);
-      while ((name = _gtk_css_parser_try_ident (parser, TRUE)))
+      while (gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_IDENT))
         {
+          name = gtk_css_parser_consume_ident (parser);
           g_string_append_c (string, ' ');
           g_string_append (string, name);
           g_free (name);